Queue a resize if the size changed. (#418047, Alex Graveley)

2007-05-30  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkiconview.c (gtk_icon_view_layout): Queue a resize
        if the size changed.  (#418047, Alex Graveley)

svn path=/trunk/; revision=17985

diff --git a/ChangeLog b/ChangeLog
index c7355d95bfebef3dd252385f5c2cba7d477c0814..88d2ec31ff3ed563479ca7d4fa9b6f78e693605c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_layout): Queue a resize
+       if the size changed.  (#418047, Alex Graveley)
+
 2007-05-30  Simos Xenitellis  <simos@gnome.org>
 
        * gdk/gdkkeysyms-update.pl: Updated script to new upstream 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 69f860f0b0d6d79d30083bdd94139a9bfc796bef..7d3505f0e8f85d5ae549ff68104bf6cc7424f56c 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2614,6 +2614,10 @@ gtk_icon_view_layout (GtkIconView *icon_view)
   gtk_icon_view_set_adjustment_upper (icon_view->priv->vadjustment, 
                                      icon_view->priv->height);
 
+  if (icon_view->priv->width != widget->requisition.width ||
+      icon_view->priv->height != widget->requisition.height)
+    gtk_widget_queue_resize_no_redraw (widget);
+
   if (GTK_WIDGET_REALIZED (icon_view))
     gdk_window_resize (icon_view->priv->bin_window,
                       MAX (icon_view->priv->width, widget->allocation.width),
@@ -2634,7 +2638,7 @@ gtk_icon_view_layout (GtkIconView *icon_view)
       gtk_tree_path_free (path);
     }
   
-  gtk_widget_queue_draw (GTK_WIDGET (icon_view));
+  gtk_widget_queue_draw (widget);
 }
 
 static void